From: Simon McVittie Date: Thu, 18 Sep 2025 09:38:19 +0000 (+0100) Subject: Generate a versioned dependency for the GLib 2.86 transition X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~88^2~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=816fa364ba112b48f62f03ffa054cafd9bd14b76;p=gnome-shell.git Generate a versioned dependency for the GLib 2.86 transition GNOME Shell will need to be rebuilt after GLib 2.86 is uploaded to unstable, so that its typelibs declare a dependency on GioUnix, which they do not when built against older GLib. Generate a versioned dependency so that this can be done via either a binNMU or a sourceful upload. --- diff --git a/debian/clean b/debian/clean index 3d6866b91..1789feeee 100644 --- a/debian/clean +++ b/debian/clean @@ -1 +1,2 @@ +debian/local.substvars debian/home/ diff --git a/debian/control b/debian/control index 675e5b65f..a24dee6c8 100644 --- a/debian/control +++ b/debian/control @@ -111,6 +111,7 @@ Depends: gir1.2-accountsservice-1.0, python3, tecla, ${gir:Depends}, + ${local:Depends}, ${misc:Depends}, ${shlibs:Depends} Recommends: bolt, diff --git a/debian/extra-substvars.sh b/debian/extra-substvars.sh new file mode 100755 index 000000000..959c28f4a --- /dev/null +++ b/debian/extra-substvars.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Copyright 2025 Simon McVittie +# SPDX-License-Identifier: MIT + +glib_version=$(dpkg-query -W -f '${Version}' "libglib2.0-dev:$DEB_HOST_ARCH") + +if dpkg --compare-versions "$glib_version" ge 2.86; then + echo "local:Depends=gir1.2-glib-2.0 (>= 2.86.0)" +else + echo "local:Depends=gir1.2-glib-2.0 (<< 2.86.0)" +fi diff --git a/debian/rules b/debian/rules index 9e1e2daad..4ad1b7f39 100755 --- a/debian/rules +++ b/debian/rules @@ -67,3 +67,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) endif override_dh_gnome_clean: + +debian/local.substvars: + dpkg-architecture -c debian/extra-substvars.sh > $@ + +override_dh_gencontrol: debian/local.substvars + dh_gencontrol -- -Tdebian/local.substvars